Merge branch 'giuseppe/staticdeltas' of https://github.com/giuseppe/ostree

diff --cc src/libostree/ostree-core-private.h
Simple merge

diff --cc src/libostree/ostree-core.c
Simple merge

diff --cc src/libostree/ostree-repo.c
Simple merge

diff --cc src/libostree/ostree-repo.h
Simple merge